From 4b60e7470aa6f2ea86c239ee13f4ceaeb563cbb7 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Sat, 10 Oct 2020 01:44:31 +0100
Subject: [PATCH] Use test AT context with installed tests

Otherwise we're going to need an AT-SPI service on the session, and the
accessibility bus.
---
 .gitlab-ci.yml                            | 1 +
 testsuite/css/api.test.in                 | 2 +-
 testsuite/css/change/change.test.in       | 2 +-
 testsuite/css/nodes/nodes.test.in         | 2 +-
 testsuite/css/parser/parser.test.in       | 2 +-
 testsuite/css/style/style.test.in         | 2 +-
 testsuite/gdk/gdk.test.in                 | 2 +-
 testsuite/gsk/render-nodes-cairo.test.in  | 2 +-
 testsuite/gsk/render-nodes-vulkan.test.in | 2 +-
 testsuite/gtk/gtk.test.in                 | 2 +-
 testsuite/reftests/reftests-dark.test.in  | 2 +-
 testsuite/reftests/reftests-hc.test.in    | 2 +-
 testsuite/reftests/reftests-hci.test.in   | 2 +-
 testsuite/reftests/reftests.test.in       | 2 +-
 testsuite/tools/tools.test.in             | 2 +-
 15 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 166d77e47b..5607e2e1aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -99,6 +99,7 @@ installed-tests:
   needs: []
   variables:
     EXTRA_MESON_FLAGS: "--prefix=/usr --libdir=/usr/lib64 -Dinstall-tests=true"
+    G_TEST_ACCESSIBLE: 1
   script:
     - meson subprojects update
     - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
diff --git a/testsuite/css/api.test.in b/testsuite/css/api.test.in
index ee5a0b38e4..d1d25a1bc1 100644
--- a/testsuite/css/api.test.in
+++ b/testsuite/css/api.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=@libexecdir@/installed-tests/gtk-4.0/css/api --tap -k
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 GTK_TEST_ACCESSIBLE=1 @libexecdir@/installed-tests/gtk-4.0/css/api --tap -k"
 Type=session
 Output=TAP
diff --git a/testsuite/css/change/change.test.in b/testsuite/css/change/change.test.in
index 0996111779..9906e9f95b 100644
--- a/testsuite/css/change/change.test.in
+++ b/testsuite/css/change/change.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=@libexecdir@/installed-tests/gtk-4.0/css/change/test-css-change --tap -k
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 GTK_TEST_ACCESSIBLE=1 @libexecdir@/installed-tests/gtk-4.0/css/change/test-css-change --tap -k"
 Type=session
 Output=TAP
diff --git a/testsuite/css/nodes/nodes.test.in b/testsuite/css/nodes/nodes.test.in
index bf5331999f..e662b746b6 100644
--- a/testsuite/css/nodes/nodes.test.in
+++ b/testsuite/css/nodes/nodes.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=@libexecdir@/installed-tests/gtk-4.0/css/nodes/test-css-nodes --tap -k
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 GTK_TEST_ACCESSIBLE=1 @libexecdir@/installed-tests/gtk-4.0/css/nodes/test-css-nodes --tap -k"
 Type=session
 Output=TAP
diff --git a/testsuite/css/parser/parser.test.in b/testsuite/css/parser/parser.test.in
index 2312d7305d..91bb6d20f6 100644
--- a/testsuite/css/parser/parser.test.in
+++ b/testsuite/css/parser/parser.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=@libexecdir@/installed-tests/gtk-4.0/css/parser/test-css-parser --tap -k
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 GTK_TEST_ACCESSIBLE=1 @libexecdir@/installed-tests/gtk-4.0/css/parser/test-css-parser --tap -k"
 Type=session
 Output=TAP
diff --git a/testsuite/css/style/style.test.in b/testsuite/css/style/style.test.in
index 2990614b51..6cce32a0a0 100644
--- a/testsuite/css/style/style.test.in
+++ b/testsuite/css/style/style.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=@libexecdir@/installed-tests/gtk-4.0/css/style/test-css-style --tap -k
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 GTK_TEST_ACCESSIBLE=1 @libexecdir@/installed-tests/gtk-4.0/css/style/test-css-style --tap -k"
 Type=session
 Output=TAP
diff --git a/testsuite/gdk/gdk.test.in b/testsuite/gdk/gdk.test.in
index 709cb6a6bd..ad90aa61ed 100644
--- a/testsuite/gdk/gdk.test.in
+++ b/testsuite/gdk/gdk.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=@testexecdir@/@test@ --tap -k --verbose
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 GTK_TEST_ACCESSIBLE=1 @testexecdir@/@test@ --tap -k --verbose"
 Type=session
 Output=TAP
diff --git a/testsuite/gsk/render-nodes-cairo.test.in b/testsuite/gsk/render-nodes-cairo.test.in
index 28a4f55d76..8976ff03d8 100644
--- a/testsuite/gsk/render-nodes-cairo.test.in
+++ b/testsuite/gsk/render-nodes-cairo.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env GSK_RENDERER=cairo @libexecdir@/installed-tests/gtk-4.0/gsk/test-render-nodes --tap -k --verbose"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 GSK_RENDERER=cairo GTK_TEST_ACCESSIBLE=1 @libexecdir@/installed-tests/gtk-4.0/gsk/test-render-nodes --tap -k --verbose"
 Type=session
 Output=TAP
diff --git a/testsuite/gsk/render-nodes-vulkan.test.in b/testsuite/gsk/render-nodes-vulkan.test.in
index d16ba906e4..4ad9523ed4 100644
--- a/testsuite/gsk/render-nodes-vulkan.test.in
+++ b/testsuite/gsk/render-nodes-vulkan.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env GSK_RENDERER=vulkan @libexecdir@/installed-tests/gtk-4.0/gsk/test-render-nodes --tap -k --verbose"
+Exec=/bin/sh -c "env GTK_TEST_ACCESSIBLE=1 GSK_RENDERER=vulkan @libexecdir@/installed-tests/gtk-4.0/gsk/test-render-nodes --tap -k --verbose"
 Type=session
 Output=TAP
diff --git a/testsuite/gtk/gtk.test.in b/testsuite/gtk/gtk.test.in
index 709cb6a6bd..ad90aa61ed 100644
--- a/testsuite/gtk/gtk.test.in
+++ b/testsuite/gtk/gtk.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=@testexecdir@/@test@ --tap -k --verbose
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 GTK_TEST_ACCESSIBLE=1 @testexecdir@/@test@ --tap -k --verbose"
 Type=session
 Output=TAP
diff --git a/testsuite/reftests/reftests-dark.test.in b/testsuite/reftests/reftests-dark.test.in
index ab0e2fb19f..d30a4f2099 100644
--- a/testsuite/reftests/reftests-dark.test.in
+++ b/testsuite/reftests/reftests-dark.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env GTK_THEME=Adwaita:dark G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests"
+Exec=/bin/sh -c "env GTK_THEME=Adwaita:dark GTK_TEST_ACCESSIBLE=1 G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests"
 Type=session-exclusive
 Output=TAP
diff --git a/testsuite/reftests/reftests-hc.test.in b/testsuite/reftests/reftests-hc.test.in
index 9d6cb5655d..88627b7ae4 100644
--- a/testsuite/reftests/reftests-hc.test.in
+++ b/testsuite/reftests/reftests-hc.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env GTK_THEME=HighContrast G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests"
+Exec=/bin/sh -c "env GTK_THEME=HighContrast GTK_TEST_ACCESSIBLE=1 G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests"
 Type=session-exclusive
 Output=TAP
diff --git a/testsuite/reftests/reftests-hci.test.in b/testsuite/reftests/reftests-hci.test.in
index 6ea0b1aa3a..24e785551c 100644
--- a/testsuite/reftests/reftests-hci.test.in
+++ b/testsuite/reftests/reftests-hci.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env GTK_THEME=HighContrastInverse G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests"
+Exec=/bin/sh -c "env GTK_THEME=HighContrastInverse GTK_TEST_ACCESSIBLE=1 G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests"
 Type=session-exclusive
 Output=TAP
diff --git a/testsuite/reftests/reftests.test.in b/testsuite/reftests/reftests.test.in
index 9eb1864bfa..53971961d6 100644
--- a/testsuite/reftests/reftests.test.in
+++ b/testsuite/reftests/reftests.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests"
+Exec=/bin/sh -c "env GTK_TEST_ACCESSIBLE=1 G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests"
 Type=session-exclusive
 Output=TAP
diff --git a/testsuite/tools/tools.test.in b/testsuite/tools/tools.test.in
index 24c47ce34f..d0f3810a44 100644
--- a/testsuite/tools/tools.test.in
+++ b/testsuite/tools/tools.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 TEST_DATA_DIR=@testexecdir@/@test@-data @testexecdir@/@test@"
+Exec=/bin/sh -c "env GTK_TEST_ACCESSIBLE=1 G_ENABLE_DIAGNOSTIC=0 TEST_DATA_DIR=@testexecdir@/@test@-data @testexecdir@/@test@"
 Type=session
 Output=TAP
-- 
2.30.2